Replace Done callback with CompletableFuture result
#2051
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laeubi
reviewed
Jul 16, 2025
...dles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalService.java
Outdated
Show resolved
Hide resolved
laeubi
reviewed
Jul 16, 2025
...dles/org.eclipse.terminal.view.core/src/org/eclipse/terminal/view/core/ITerminalService.java
Outdated
Show resolved
Hide resolved
Contributor
ruspl-afed
force-pushed
the
done_null_to_none
branch
from
e8a617b to
161c5e8
Compare
ruspl-afed
changed the title
Done callback to stop accepting nullCompletableFuture result
ruspl-afed
changed the title
CompletableFuture resultDone callback with CompletableFuture result
ruspl-afed
commented
Jul 16, 2025
...rg.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/ILauncherDelegate.java
Outdated
Show resolved
Hide resolved
laeubi
reviewed
Jul 16, 2025
Contributor
laeubi
left a comment
laeubi
left a comment
There was a problem hiding this comment.
@laeubi may be we should return IStatus here to simplify caller's life?
I think a CF is better to reflect the async nature of this, but using IStatus at all seems questionable to me. an anonymous CompletableFuture<?> that simply is failed on any error seems more appropriate.. if we feel to pass a status a CoreException can then be used.
...connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java
Outdated
Show resolved
Hide resolved
...connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java
Outdated
Show resolved
Hide resolved
....connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherHandler.java
Show resolved
Hide resolved
.../org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TerminalService.java
Show resolved
Hide resolved
.../org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TerminalService.java
Outdated
Show resolved
Hide resolved
....view.ui/src/org/eclipse/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java
Outdated
Show resolved
Hide resolved
...view.ui/src/org/eclipse/terminal/view/ui/internal/local/showin/DynamicContributionItems.java
Outdated
Show resolved
Hide resolved
...pse.terminal.view.ui/src/org/eclipse/terminal/view/ui/launcher/AbstractLauncherDelegate.java
Outdated
Show resolved
Hide resolved
ruspl-afed
force-pushed
the
done_null_to_none
branch
2 times, most recently
from
5361f03 to
09863d2
Compare
Contributor
Author
|
Now the snippet is @laeubi try {
delegate.execute(properties);
} catch (Exception e) {
throw new ExecutionException(e.getMessage(), e);
//or log
} |
laeubi
reviewed
Jul 16, 2025
...tor.process/src/org/eclipse/terminal/connector/process/internal/ProcessLauncherDelegate.java
Outdated
Show resolved
Hide resolved
.../org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TerminalService.java
Outdated
Show resolved
Hide resolved
Currently `null` is tolerated as a callback for a number of terminal-related operations. Moreover, it seems that callers prefer to avoid any callback. Replace rarely used callback with completable future result.
ruspl-afed
force-pushed
the
done_null_to_none
branch
from
09863d2 to
00f2335
Compare
jonahgraham
reviewed
Sep 16, 2025
Comment on lines
+197
to
+201
| if (runnable.isExecuteAsync()) { | ||
| return CompletableFuture.supplyAsync(() -> runnable.run(tvid, title, connector, data), | ||
| Display.getDefault()); | ||
| } else { | ||
| try { | ||
| Display display = PlatformUI.getWorkbench().getDisplay(); | ||
| display.asyncExec(() -> runnable.run(tvid, title, connector, data, done)); | ||
| } catch (Exception e) { | ||
| // if display is disposed, silently ignore. | ||
| } | ||
| return CompletableFuture.completedFuture(runnable.run(tvid, title, connector, data)); |
Contributor
There was a problem hiding this comment.
Note that effectively both of the branches of this if statement run the runnable immediately instead of queuing it on the display queue.
See #2155 (comment)
and Display.execute(Runnable) which is used by asyncSupplyStage. When Display.execute is called on the UI thread, then the runnable is run immediately.
Contributor
There was a problem hiding this comment.
When Display.execute is called on the UI thread, then the runnable is run immediately.
That's indeed the case... I think one can simply pass in display::asyncExec as the executor to get the desired effect as before.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently
nullis tolerated as a callback for a number of terminal-related operations. The introduced empty implementationNOOPallows to prohibitnullas a callback argument.